Add enter/exit for entire walk