JH's 3/6 changes ...