Flags added
Added flag polling