Begining of simplification added