updated for 1.6 r1