editing some changes that were need to be made during merging, my bad