Few changes to try to combat ordering bugs. needs rethink