Added some flags that might help performance