Improve performance of walk and table