applied some changes