+ Changes due to refactoring of situation acquisition