Added traps and new particle systems