Update for whack 0.5