Initial tweaks to James's excellent start