MAINT: attempts to speed up the sampling