More update & more fix