Sample rework done for now