Feature/620 tdtm ordering scheme

Fix for #620