Luke - changed some buttons