Removed Q1 and Q2
Re added Q1 and Q2