Added better logic for skip button.