Small changes
Added some small changes