Updated samples with shortener