added q, r & s