Changed to support extra button