Add another tight walker with error message
Some refactors