large changes to the sub repos used