updates to be compatible with Rails 4