Added simplification