Some changes in PickFile 2