Updated to reflect David and Jamie's suggestons, ready for another look