[Done] fixed issue with states and reset