Flagging improvement