Second pass, changed made (to be checked by JG)