Reverted the button press change, it broke things.