here are a few more changes