Redesign for second worker