Patching up missing parts still