Edit to work on GC297