Updated for 1.6 R3