Added some more changes