update from dini-ag-kim