enhanced version - 2 buttons