update for Rails 4/2