Can now skip first density calc., and tweaked hack.