Updated with samples