Minor edits to flagging, enabling just expansion based flagging to run