sampling tweaks WIP