Updated with walker example from master