Cancel Button Functionality did not carry over in previous commit