made some more changes