gender refactor 1.0