Added Flags

By Roberto