Added substring calls to Q22