Added validation, added manual sampling