Undid some changes that werent working