changes for Rails 4