Tweaking egp3 stuff