Rewrote some shit