revise some picking logic to work with new renderer