update by YYU advice