Updated to use 4.1 rails