R1

updated for R1 compatibility