changes attempt to fix issue with tm. not done yet