Rewrote it all...