changed a couple of things to try and get it working