More marvellous code from Tim and Marco.