Simplification added