added code for q1.10