merge in kai changes