button and more updates