Changed to match new Buttons class