build system improved