type changes for R17