restructure selection
preliminary WK-296