updated to support R17