MOB-164 buttonpress bug, now using add and remove instead of toggle