made some even more changes