some changes here