Modified to work with rails 4