start of switching to a single button. seems to work