Redid some changes that were overwritten by git