Jack's attempt to fix's James' merge conflicts