update to trema @ e099ea3