Improved walker.cpp