updating to handle KC smoothly