rolling back to just a single bag, almost working