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