production + controller updates