Added a bunch of changes that were actually on the server