improved wagn command