redid changes that were deleted DON'T TOUCH