overhaul for subpathing