Using the new framework for more samples