Patched and reorganized