joke and whip added