FilePicker hacked branch