some changes draft of gender mechanism, but not tested yet :)