Also updated ewf.c and aff.c