Added controller and gender select