Edge

This request contains the fix for issue find with re-ordering works.