Updated Controller 2 Functions