modified to rails 4.1