Made some more additional changes -Jon