sync with Pablo and corrected LKV