contiue to adapt the build system to internal system