Some work on the sifting changes, still need to think about some aspects of it