Improve two versions.