Updated samples at Zach's request