Upgraded to Razor 2