Added step optimization