Made revisions to reduce impact of GEM changes