OCD is tingling

(also weapon fix)