GEM:16 changed the stuff as needed