added changes to work out correct submodule inclusion