Add other changes and such