fix overall controller