update by nicky 17:00