Added some more basic changes