Improved kick logic