Adaptation for R17