Almost 101% rewrite!