Added some minor changes