Removed weird integrity check and added store of sample