some changes here and there