Updated editing substantially