Some stuff for EG2, no actual new stuff