update by nicky 07/11 11:00