changes according to Rails 4