gender refactor 1.2