Geoff Martin's Oxford Builder 2 comp altered.