added fancier picker