bug fix and refactor to corridor paths