Changes for me/_tmo fix