Updating other parts of the project
So many spots to update!