New 2.0 update, Finalized. Last minute changes.