made some changes I guess