Add resampling to/from 8000, add more states