slight mod, shortened path