before simplification
few changes