Added kick handling.