update file according to comments of vrabaud