OK, now refactored w/ button