Merge for nathan

merge for nathan