main changes before I wipe the server