KCINFR-979: giving proper attribution, also updating code.