There you have it - the re-write!