Updated controller and bootstrap