added gender and fixed value save