just a few more changes