still fixing path finder logic