cleaned up q2