Adding Reset Functionality; Not working with changes in System