updating for R17