Patched cleaned up.