Tdh merged 2

this looks a fix I made that shouldnt have been in this commit... just reverting it for now, will PR separately