-did some changes