Added kicker - and some other changes.