Tightened up settings