add q, cleanup