upgraded for rails 3.2.11