put flag manager back