Added safety factors to particle vectors