ISSUE #14 and faster wallwalk