Fixed controller logic