Update: with critical bug before leave.