i did some more changes