Adding final touches to sample