Remade SNR

Appears to work...