added subproject. updated logic.