JH's second round of changes...