Add default, improve sampling