added expression-answer and free-response