James - adding some more setup