New code to do spectra separately
no change
...