More tweaks to samaple program