More work on departure picker