works for q2 now