Sandman example improvements