revised build system
revised build system