updated with new question