updated detection of core & better length scale