Add max passengers variable, del groups choice