Minor changes for James's setup