tested, added R17