This is a great rewrite. :hamster: