Working z,w instead of sig. Also save el and h for each particle.