Added gender macros to affected areas