Bug 5456/rewrite techniques to use normal ordering

One commit for new versions, one commit for reordering