added tm stuff