Well done, great improvement over the original.