Fixed sweep
Added new changes