updates for Rails 4