My modifications: