Initial Controller update