Adding code for q2/