updated and added so tm compatability functions