Added some other changes