more heavy editing