POPS-191 part 1 - adoption for multi flight scenarion