update according to boy's advise