made some more changes!