Updated contoller