GEM:14 Some preliminary changes, not done yet