Rewrote all the changes from yesterday