restructuring hopfully to solve path problems