More work on pressed button state