did some more changes