Tweaks to ch003