Added some initital changes