Some tweaks to TEG