Added r-tree, separated events and flags.