Enhanced Controller