Modified Controller