#49 improved speed of new sampling