Updated to rails 4 syntax