Many changes to use the augmented particles and their optimizations