some changes I guess