renamed and simplification started