more work done on buttons