Hardy 472

Added two more commits on top of Hardy's PR.