Added better kick handling