modified build structure -- reimplemented integration