Updated guest controller