updated to support rails 3.2 stuff