Controllers partially rewritten