New controller and fixed routing