patched initial commit