aligning with existing build system