update logic for paths to be more intuitive