Updated the references to the sub solutions