Added some simple changes