Rewrote yet again