Some state renaming and reworking
Add Resetting state