final changes to add gender