added stub and buttons