Adding some small changes