Added pick functionality