Add patch by David P. Kendal for kick and mode support