Updated version with work assignment in place