Rewrote button pushing for new strategy