More work on button pressed state