3.1 compat (controller and templates)