Update from joo 20241112