Modified existing controller