Last modification before thesis defense.