Altered a couple of instances of 'this' to debug