change the structure of q1 a little