refactored branch with controler and gender.
updated