Refactored KickStart logic