Changes to Reset logic