before push_particle changes