Updated for 1.0.0 RTW