G : added buttons and states