Adding a few more changes