Teo version current

Incorporates Teo’s updates.