Work on adding hybrid sampling