Changed defines for gcw