Adding the broken bits back.