Fixed/tweaked TPADensity