It's the little things that get you... Changes for issue #10