UPGRADED CONTROLLERS