working on upgrading to Rails 4.1