Revised build mechanism