Changes to button 1 logic