Updated to Radix 3.x