Added message to button 1
merged KK's button 2 changes with my button 1 changes