merge #2, update___ in button