initial changes for rails 4