Added q, y switches