Tweak to picking to allow for dynamic picks.