Efficiency update; take initial samples, rather than removing final samples