Final changes initial commit