Spiced up HW Chap 2 a bit