update with all the comments of WouterJ