Update to whack 0.6