Added flags
added some flags
Merge