Breaking things up to fix them again.