improve CL responsiveness by only importing when necessary.