implemented latest changes in Tenzo