Update for whack 0.4.0