TEO modified - finished