Moved flag one level higher