[FIX] refactored build sequence. Verified output works.