added some changes here and there