added ability to build both