Tightened up flagging paramters