rework path code again