cleaned up q6