Redesign and debug work splitting