Added some small changes