update 18/6