Started on fixing reset
Fixed reset
Merge branch 'feature/reset_fixing' into develop