Beta2: updated btnContinue code