walf feature

walf change, please pull this in!