re arrange onAnswerChecked logic