improved the pick part