Alex: merge in game flow