Improves on the original in a lot of ways