refactored solution to fix paraller build issue