improved sample
wip