Upgrade to new rails