update picking infrastructure, demos