rails 3.2 => 4.0 (continued)