Modified Controller and Routes