Fiddled with some settings, removed broken diamond stop attempt