update according to HTTL author's advice