Rewrote some of the info