New kicker commit

And I think this is of major major importance...