merge with laruence

merge with laruence