walf feature 3

walf change, please pull this in!