New controller logic
Merge