[617] Update code