Added Apple's picker code