changes to work with rails 4