Made some changes here and there