added a few more changes