Tweaked to work better with much better settings