made some more more changes