added better kick handling