yashsingh1/xdaforums huggingface dataset:
[Sony Xperia C] wwwhana:
my recovery maybe cwm(cause i dont touch it)

that error

# In case value of PACKAGES is empty.
Package target files: /media/lexia/and/android/out/target/product/wukong/obj/PACKAGING/target_files_intermediates/cm_wukong-target_files-09d5d4bec3.zip
using prebuilt recovery.img from BOOTABLE_IMAGES...
using prebuilt boot.img from BOOTABLE_IMAGES...
Traceback (most recent call last):
File "./build/tools/releasetools/make_recovery_patch", line 53, in <module>
main(sys.argv[1:])
File "./build/tools/releasetools/make_recovery_patch", line 49, in main
common.MakeRecoveryPatch(input_dir, output_sink, recovery_img, boot_img)
File "/media/lexia/and/android/build/tools/releasetools/common.py", line 1293, in MakeRecoveryPatch
td_pair = GetTypeAndDevice("/recovery", info_dict)
File "/media/lexia/and/android/build/tools/releasetools/common.py", line 1240, in GetTypeAndDevice
return PARTITION_TYPES[fstab[mount_point].fs_type], fstab[mount_point].device
KeyError: '/recovery'
make: *** [/media/lexia/and/android/out/target/product/wukong/obj/PACKAGING/target_files_intermediates/cm_wukong-target_files-09d5d4bec3.zip] Error 1

#### make failed to build some targets (14:17 (mm:ss)) ####
[Sony Xperia C] Riccorbypro:
Try taking out the recovery and kernel, we'll include TWRP from XZDR. That way, we have a kernel that we know works... Although I'm not sure if the arguments will be correct...

Sent via Carrier Pigeon
[Sony Xperia C] wwwhana:
i try recovery.twrp.cpio.lzma from nut's recovery unpack and rename ramdisk-recovery.cpio. copy here $out-folder/root/sbin

that result it's fail..

but boot on press volume up cwm...?
[Sony Xperia C] Riccorbypro:
Yes, well, TWRP is default, but it should work... Hmmm.
[Sony Xperia C] :
ummm, press volume down when green led and release when purple led
[Sony Xperia C] Riccorbypro:
Or button mash both volume up and volume down... That's what I usually do...

Sent via Carrier Pigeon
[Sony Xperia C] cezer kiran:
Mate the t2u has seperate configs for single and dual sims but the c3 and c3 dual shares the same config 'wukong defconfig '. I have confirmed that on seeing read me xperia file inside the kernel tree
[Sony Xperia C] Riccorbypro:
Any idea where to find "wcd9306" binaries? I've checked the Archives and Google, but con't find anything...
[Sony Xperia C] wwwhana:
if you say firmware?

that get from stock firmware
[Sony Xperia C] Riccorbypro:
I've tried extracting it... The file is shown in root browser, but when I try adb pull, it says the file doesn't exist...

Sent via Carrier Pigeon
[Sony Xperia C] wwwhana:
that say bootable my test rom with my kernel.

if try it?

boot.img match system.img cause ramdisk is difference by rom

my custom boot.img has cm boot script

please turn on adb after flashing and see logcat
[Sony Xperia C] wwwhana:
/system/etc/frimware/
[Sony Xperia C] Riccorbypro:
It's there, but when I try extract it, it says the file doesn't exist...

Sent via Carrier Pigeon
[Sony Xperia C] wwwhana:
i already extract firmware from ftf file firmware version is 5.1.1(19.4~~)

i get 2files that

wcd9306_anc.bin

wcd9306_mbhc.bin
[Sony Xperia C] Riccorbypro:
I see those on my phone under /system/etc/firmware, but when I extract, it says operation failed - file does not exist.

Sent via Carrier Pigeon
[Sony Xperia C] wwwhana:
try from firmware file?

unpack system.sin -> system.ext4

that can mount on linux
[Sony Xperia C] Riccorbypro:
OK I've done that...

But still this happens...

What now???

Sent via Carrier Pigeon
[Sony Xperia C] :
I wanna ask, do you guys get your guides and help from XDA University or from the general forums here?
[Sony Xperia C] Riccorbypro:
I don't know about [MENTION=6724994]wwwhana[/MENTION], but for me, Both.
[Sony Xperia C] wwwhana:
if you check

vendor/sony/wukong/proprietary/etc/firmware/wcd9306/wcd9306_anc.bin:system/etc/firmware/wcd9306/wcd9306_anc.bin \
vendor/sony/wukong/proprietary/etc/firmware/wcd9306/wcd9306_mbhc.bin:system/etc/firmware/wcd9306/wcd9306_mbhc.bin \

in wukong-vendor-blobs.mk
[Sony Xperia C] wwwhana:
l read Before some month..

i just think after search and try
[Sony Xperia C] Riccorbypro:
It all makes sense now... Those are symlinks. They link to /data/misc/audio/*.

I've taken them out of the blobs, hopefully it'll compile now...
[Sony Xperia C] wwwhana:
i try using open source archive and twrp

i'm reset allthing

i try replace twrp than cwm and i try use sony opensource archive yukon tree with some file from stock rom like tianchi

also merge sony repo

so result is success but twrp has noise display and that not lsmod wlan.ko....

(recovery eneter is when purple led click volume buttons)

i will try add some library

I hope working sensors
[Sony Xperia C] Riccorbypro:
And now I have that exact error... Did you eventually solve it?

using prebuilt recovery.img from BOOTABLE_IMAGES...
using prebuilt boot.img from BOOTABLE_IMAGES...
Traceback (most recent call last):
File "./build/tools/releasetools/make_recovery_patch", line 53, in <module>
main(sys.argv[1:])
File "./build/tools/releasetools/make_recovery_patch", line 49, in main
common.MakeRecoveryPatch(input_dir, output_sink, recovery_img, boot_img)
File "/home/riccorbypro/cyanogenmod/build/tools/releasetools/common.py", line 1293, in MakeRecoveryPatch
td_pair = GetTypeAndDevice("/recovery", info_dict)
File "/home/riccorbypro/cyanogenmod/build/tools/releasetools/common.py", line 1240, in GetTypeAndDevice
return PARTITION_TYPES[fstab[mount_point].fs_type], fstab[mount_point].device
KeyError: '/recovery'
build/core/Makefile:1498: recipe for target '/home/riccorbypro/cyanogenmod/out/target/product/wukong/obj/PACKAGING/target_files_intermediates/cm_wukong-target_files-3bfe46b984.zip' failed
make: *** [/home/riccorbypro/cyanogenmod/out/target/product/wukong/obj/PACKAGING/target_files_intermediates/cm_wukong-target_files-3bfe46b984.zip] Error 1

#### make failed to build some targets (12:54 (mm:ss)) ####

riccorbypro@riccorbypro-UBUNTU:~/cyanogenmod$
[Sony Xperia C] wwwhana:
not yet...

i can't working cause final test....asdf:crying:
[Sony Xperia C] Riccorbypro:
Damn. To Google!!!
[Sony Xperia C] Riccorbypro:
This error seems to be related to the fact that our phone doesn't have a dedicated /recovery partition... [MENTION=6724994]wwwhana[/MENTION] where would I find our device's recovery.fstab? Because it should differ in style from fstab.yukon, but I can't find one... Any ideas?
[Sony Xperia C] Riccorbypro:
Fixed

OK, so to get it to compile, I just added

/dev/null /recovery emmc defaults defaults

to the end of the fstab.yukon file. Find the full file attached. Now to test...
[Sony Xperia C] :
...

This ain't for us (me? I've yet to see a normal user this active here), is it?
[Sony Xperia C] Riccorbypro:
No, its for wwwhana. Just info on how to fix the /recovery error... But I've built a flashable zip, and am feeding the kernel through nut's XZDR builder, then I'll repack and upload...

Sent via Carrier Pigeon
[Sony Xperia C] wwwhana:
Our recovery is FOTAKernel partiton

New bootloader(except c3...) use recovery this partiton
[Sony Xperia C] :
Ahhh, that was fast thanks
[Sony Xperia C] Riccorbypro:
Ah OK well I pushed the boot.img through XZDR builder so we still have TWRP... Just assigned /recovery to /dev/null

Sent via Carrier Pigeon

---------- Post added at 07:54 ---------- Previous post was at 07:47 ----------

So more like this [MENTION=6724994]wwwhana[/MENTION]?

/dev/block/platform/msm_sdcc.1/by-name/FOTAKernel /recovery emmc defaults defaults
[Sony Xperia C] wwwhana:
Yes, that it
[Sony Xperia C] wwwhana:
do it make updae.zip!

but i have new error.. some mad error

i will hard working after this friday...

i hard study my last test....than this working

but with that cause build from computer not me type 101010.....

i will try that possible merge from cm or try porting aosp project kernel....

i say when start this project... i'm newbie newbie so that hard working...
[Sony Xperia C] Riccorbypro:
Well my flashable zip finally built... Three problems:

Cellular data.

WiFi.

Camera.

[MENTION=6724994]wwwhana[/MENTION] how did you get WiFi working again???

Sent via Carrier Pigeon
[Sony Xperia C] wwwhana:
try on terminal

su -c insmod /system/lib/modules/wlan.ko

after no message that it working

(if not working wifi? but tethering so working)

so add script this line on boot
[Sony Xperia C] wwwhana:
celluar working maybe my vendor tree in extarct from proprietary-files.txt(wukong, msm8226)

camera is why not broken again....

camera is possible some error or file fix

----add----

if you not setting apn??
[Sony Xperia C] Riccorbypro:
Good news:

Sony released Open-Source Camera modules, and our SoC is on the "Up Next" List! We might be getting CAMERA SOURCE!!!

On an unrelated note - Cellular data still doesn't work (although RIL/Calls and network work), even with the extracted blobs...
[Sony Xperia C] wwwhana:
i send mms..so think that working

ah..camera is not working cause that not include from camera sensor!

and i try sony opensource blob...that boot loop!

sensor or battery status service notworking!

i check not working data networking
[Sony Xperia C] wwwhana:
and i have working caemra rom(when i say working caemra!!)...so i will test what is difference that rom
[Sony Xperia C] :
OOOOHHHH where'd you see that article? I wanna read XD
[Sony Xperia C] wwwhana:
maybe this article from camera

http://developer.sonymobile.com/201...-camera-available-for-experienced-developers/

but that not include our full camerasensor( just 1sensor that imx)
[Sony Xperia C] wwwhana:
https://talk.sonymobile.com/t5/Loll...iguration-for-AOSP-Build/m-p/1046900#U1046900

Au.....umm....

but vendor blob is problem...
[Sony Xperia C] :
Dafuq is this porkery?

Welp, if I'm reading it right then it's still possible to obtain and install the 4.4 camera sensors since 5.0+ spoiled it?
[Sony Xperia C] Riccorbypro:
The M2, E3, and T3 use the same camera sensor, so we should have camera sources...

---------- Post added at 17:28 ---------- Previous post was at 17:24 ----------

Nope. 4.4 uses Dalvik VM, as opposed to 5.0+ ART. The camera sources had to be remade for ART
[Sony Xperia C] :
I see. Would that still solve the blur problem?
[Sony Xperia C] Riccorbypro:
The blurry camera seems to be related to the fact that we've unlocked our bootloader. DRM keys have been deleted, so, unless we can get them back, blurry camera forever. I remember back in 4.4, the day after I unlocked my bootloader, I took a photo and it was a bit blurry. I won't deny that the lollipop update made it worse, but it started when I unlocked my Bootloader...
[Sony Xperia C] :
Really? Mine started when I updated to Lollipop. Flashing KK unlocked brought it back to normal >.>
[Sony Xperia C] Riccorbypro:
Two things that should brick your phone in one post... flashing KK over L... On an unlocked BL!
[Sony Xperia C] :
...

...

...

I LIVE TO DIE ANOTHER DAY

So you're saying the two instances I flashed the .ftf very nearly killed the little bugger?

Edit: EDIT
[Sony Xperia C] Riccorbypro:
One should NEVER downgrade your OS. And, as your BL is unlocked, your BL would have been overwritten as well... if you downgrade the BL, you should downgrade EVERYTHING, which is impossible, as your TA partition cannot be downgraded... You're VERY lucky... Your phone should be a brick right now, like my old one...
[Sony Xperia C] :
Welp, guess I know where my game luck went. But what is this applicable to or what're the requirements? Stock firmwares? Xperia phones?

Is there not any safe way to flash lower versions?

How about flashable zips?

Does stock roms do this too?

Aaahhh so many questions.
[Sony Xperia C] cezer kiran:
I have tried the commits from moto g and samsung tab which both have the same soc to unlock undervolting. But still bad luck for me and interstingly none Of the yukon family devices have custom kernel to support undervolting luks wierd!

---------- Post added at 05:04 AM ---------- Previous post was at 04:59 AM ----------

Guys if anyone gets undervolting kernel source for yukon famly or a commits related to undervolting (msm8226) post reply
[Sony Xperia C] wwwhana:
comeback!

finish this year semester!

so i try aosp rom

cause think that is first...and almost issue maybe kernel

i read device tree on sony aosp kerenl.i don't have relate knowloge and they has difference copyleft....

i will puase cm but try aosp
[Sony Xperia C] :
Uuuuooohhh, I recommend CarbonRom XD

Has a lot of customisability compared to CM and snappier
[Sony Xperia C] Riccorbypro:
Dangers:

BL Overwritten -> Soft Brick

Modem Too High a version for ROM -> No cell service... EVER. Could also stop loading the BL -> Hard Brick

Userdata wiped due to Android downgrade -> No effect beside deleting /data (internal storage included)

Any ROM will do this. Flashable zips, ftf files, odin flashes for Samsung, ANYTHING.

There is NO safe way to DOWNGRADE Android, unless someone makes a FULL image of the eMMC. This means an 8GB image, plus partition table (for our phone). This means you have to wipe your partition table, replace it with theirs, and write the new image. And I, for one, am NEVER messing around with partition tables EVER again. That's what hard bricked my old C3...
[Sony Xperia C] wwwhana:
accsess by name safe when use partition(on qcom system)

and we know correctly size about partition!!

that is important!
[Sony Xperia C] :
I don't know what you did with that but I've been fine all this while. My Note 1 had repartitioned internal from 2GB to 6GB without a problem with more than a 100 flashes ._.

I don't mess with the partitions with the C3 because it's a combined system (or whatever they call it).

Anyhoo, tough luck.
[Sony Xperia C] Riccorbypro:
But then you get some of us that use /dev/block/mmcblk*p*

And then you get me, who accidentally DELETED /dev/block/mmcblk0...

And trust me, I tried to restore the partition sceme... I did have the full partition table, and backups of it. But it was useless... the phone was hard-bricked.
[Sony Xperia C] wwwhana:
i try transplantation on sony aosp tree...

that is may difference dtb tree...

and gpio tree...

i build kernel but...that boot fail...

maybe that transplantation...do we use sony aosp vendor tree?

for now....i try that...

C3 similar T2 Ultra(Of course it varies some gpio) that maybe possible transplantation to sony aosp kernel tree

some source same from copyleft
[Sony Xperia C] cezer kiran:
I think the drm keys camera capablity all are myths i had proof but i deleted those images so i think we can over come the camera issue the drm camera issue is only stated in z2 and z3 and according to me it was nice to lose the drm keys bcaz the in comparison images before and after on z2 camera only the images showed bit dark but trust me the level of detail increased a fair amount
[Sony Xperia C] Riccorbypro:
Check over in the E3 forums... I saw a "Hybrid" kernel that had Undervolting, Overclocking, a bunch of extra governors, etc. in it. I've asked the dev if they mind us adapting it to our device, I suppose we'll see what he says...
[Sony Xperia C] cezer kiran:
can you give me the link
[Sony Xperia C] :
Add in interactive or interactivex if they have it. If it is compiled and the parameters are all there we can push an edit to balance performance and battery for other devices, maybe even catch an eye of Google or Sony devs to implement tweaks from a guide I'm following.
[Sony Xperia C] Riccorbypro:
http://xdaforums.com/xperia-e3/development/kernel-hybrid-kernel-xperia-e3-t3167759
[Sony Xperia C] cezer kiran:
atlast vinay has accepted our request so i think i should fork either rico's or wwwhana's kernel (copyleft) and try some luck for our c3
[Sony Xperia C] Riccorbypro:
Fork vinay's kernel, and merge it with the copyleft sources. That should (theoretically) work. I hope it does... He also said we can PM him on what we don't understand on kernel modding/adding features...
[Sony Xperia C] :
Ain't that just fine. Y'all got a senpai now XD
[Sony Xperia C] cezer kiran:
seems we dont need all the features and i think this isnt a great idea:confused: also his hybrid repo only contain kernel for cm 11 and kitkat
[Sony Xperia C] Riccorbypro:
You're forgetting that cm11 and KitKat on the E3, all use kernel 3.4. Now think about our kernel... 3.4. The branch of Android isn't important, its the kernel version... So it should work, just remember to change the kernel command line to our device...

Sent via Carrier Pigeon
[Sony Xperia C] cezer kiran:
ill go with you ricco will try
[XDA Assist] drsleep1:
Can someone direct me to firmware for Samsung S5, region Australia, not found in the Samsung firmware page, every region but Australia My phone purchased in Korea. FIRMWARE NEEDED G900IDVU1BOJ1. Phone on Optus network, but not locked.
[XDA Assist] Droidriven:
Hello,

Welcome to XDA.

You would have better luck if you went Sammobile.com, samsung-updates.com or galaxys5update.com. You will need to use your model number and possibly the specific build number that you are looking for.

Hope this helps, good luck.
[LG Optimus G (International)] Messed_sensation:
Hello everyone,

I received a E973 with a broken screen and it is locked to the Bell network. I changed the screen but damaged the volume cable in the process (a new cable has been ordered). First of all, I am on the Koodo network but the phone is locked to Bell, so I will need to get it unlocked, I would also like to root the phone to get rid of bloat ware. I plan to get the carrier to unlock the network for me or buy a code and unlock it that way. Does it matter if which one I do first? (Root or unlock). Also I noticed that every time I turn the phone off/on or restart, it forgets the wifi network and password. Any guidance is greatly appreciated. Thank you for reading.

Kevin
[LG Optimus G (International)] SREEPRAJAY:
Thread closed on OPs request
[Galaxy S6 Edge Q&A, Help & Troubleshooting] shawnmoustache:
Hey guys, is it just me but when i try to use the edge screen functions to view notifications or time it is really slow....it takes like about 10 seconds just to turn on...anyone has any solutions? :(:( :( :(
[Galaxy S6 Edge Q&A, Help & Troubleshooting] shawnmoustache:
anyone?
[Galaxy S6 Edge Q&A, Help & Troubleshooting] michael lakew:
mine to and i dont know why :crying:
[OnePlus 2 Q&A, Help & Troubleshooting] filledk:
hallo all, remembered that for the oneplus one was a mod that when playing a youtube video or music it would use earpeace speaker+standard speaker on the bottom the phone, to get a little better (kinda half-front facing) sound

i request a mod for the Oneplus 2 that would do this

AND also it would increase the sound by 20% or even 30% (as we all know the sound is a little low) at its max sound settings (full volume)

maby a flashble .zip file to do this and another flashble .zip to revert to stock

i would code this myself, IF I KNEW HOW TO CODE :( but sadly i dont :(

regards and best wishes

FilleDK
[OnePlus 2 Q&A, Help & Troubleshooting] filledk:
No one?
[OnePlus 2 Q&A, Help & Troubleshooting] arch_geek:
hi dude.

i can take a look at it if you show me the mod for OnePlus One that did the same.
[OnePlus 2 Q&A, Help & Troubleshooting] rascal0pl:
I will upload my mixer_paths.xml file which is much improving sound quality in general (turned off audio compression etc), not only increasing volume when I return to home.

But I'm on Hydrogen Beta rom, so I don't know if it will be compatible with older roms.
[OnePlus 2 Q&A, Help & Troubleshooting] bjscott55:
That would be good ill test it on stock 2.2.0
[OnePlus 2 Q&A, Help & Troubleshooting] suraj.das:
would be great if you could place all the changes you made in one place and give it to us.

Thanks anyways
[OnePlus 2 Q&A, Help & Troubleshooting] krishna442:
[MENTION=5988088]filledk[/MENTION] buddy can you post the link for that mod.(the one you were talking about)
[Verizon LG G4] eliniko:
Hi Everyone,

I am traveling to Europe and want to use a local carrier sim (Vodaphone) in my Verizon LG4...is this possible by just switching the sim and the setting to GSM?

Excuse me if its a silly question, I just dont have any idea....:confused:
[Verizon LG G4] konradsa:
It will work as you described, just don't expected to get much in terms of LTE. But UMTS (HSPA+) will work just fine.
[Verizon LG G4] billybob275:
It worked for me in the UK with EE a couple months ago, but like konradsa said, I only got HSPA+. Not the fastest speed, but was still plenty for my visit.
[Verizon LG G4] eliniko:
thank you both for your replies, did yuo have to add the APN information?
[Galaxy Note 3 Exynos Android Development] vishalpandey:
NOTE: I'm not the developer, I just created this thread to avoid confusion in other threads. I saw many people sharing different links in different rom threads. And it's a humble request that whatever update links you get post here dont post in other threads.

Post here I will update the OP with the perfect description and details.

Thanks alot please co-operate. :)

Dark-Au S6 V4 Final N900

download link

link 1 - mega : https://mega.nz/#!3tlC0ISY!xB1lOIsee-g7B-CkgxCaM72-qCRjSXaJc53Hamt_Hew

link 2 - fshare : https://www.fshare.vn/file/RY96TAO9YU2G

Changelog:

Very much stable.

Ram usage tweaks.

Better Battery life tweaks.

Enhanced settings.

Advanced settings added inside the settings itself.

Aurora 5.2 (old rom)

ROM LINK

AURORA v5.2 S6N5 ROM CONTROL

Change log :

1.Multilanguage

2.Multiuser

3.Improved battery life and performance.

4.Added Rom control.

5.Samsung account fix.

ROM 5.2 S6N5 Aurora

Fix samsung account 5.2.zip

Weather fix (English)

http://www.mediafire.com/?f6o9hd7i9zypebw

Thanks to [MENTION=458056]pekaka[/MENTION]

Aurora updated settings apk updated link.

https://mega.nz/#!4RlzhDiI!sHo4JTXXakv4TgoiceC7l_3h7YJAnWunJ9NuXsGxwEQ

New [MENTION=6448095]synsmaster[/MENTION] kernel link

https://mega.nz/#!UAN2QZwA!bP2lg08BlH6kOvmzpFPEXY9bCLPsn40_Yz0AvYx5Bmo

Flashify link

https://mega.nz/#!9JcXDSTS!iavrZAJx0vVGO0wEApJk71l4tcqIbrf-XyauNEBZtSU

Kernel usage screenshots

Use flashify to flash the kernel

Credits: Aurora team

Do hit the thanks button if you liked the ROM
[Galaxy Note 3 Exynos Android Development] kaliyaakakallu1:
Seems to be the perfect rom, as fix to spen input and rom control both present.

just two questions:

1. Is the smart select saving to scrapbook still gives force close

2. Is the spen button working to drag-and-select images in gallery, also air command can be launched by spen button??

EDIT: (UPDATES about 5.2)

None of the above issues anymore (spen button still not working) It's the best version till now, installed xposed all butter smooth:)

Thanks for sharing [MENTION=6593659]vishalpandey[/MENTION]
[Galaxy Note 3 Exynos Android Development] vishalpandey:
I'm sorry mate....As I'm on my "Diwali" vacations didn't get a chance to download 5.1 update.

I will download once I'm back from my vacations.
[Galaxy Note 3 Exynos Android Development] technologybaron:
What's rom android version?
[Galaxy Note 3 Exynos Android Development] rajnish_1604@yahoo.com:
Can i install 5.1 on aurora 4.3??
[Galaxy Note 3 Exynos Android Development] vishalpandey:
You can..Just flash the lollipop bootloader after flashing the rom
[Galaxy Note 3 Exynos Android Development] vishalpandey:
I don't know mate....I just created this thread to avoid confusion from other threads. Maybe someone else can help you who flashed this rom. And I'm too busy as I'm on vacation so no time for flashing this update :/
[Galaxy Note 3 Exynos Android Development] ninja_unmatched:
Cool....
[Galaxy Note 3 Exynos Android Development] hsckishan:
Links language is not English how to download??
[Galaxy Note 3 Exynos Android Development] kaliyaakakallu1:
it is the same, Android 5.0.2

yes, you can dirty flash it on aurora 4.3, i did the same. all good till now, but i would recommend to have a clean flash to get everything smooth and best battery.

the links are removed right now, both of them says file not found in Russian.
[Galaxy Note 3 Exynos Android Development] alldine345:
link doesnt work. it's not available.
[Galaxy Note 3 Exynos Android Development] rajnish_1604@yahoo.com:
+1 me to link not working
[Galaxy Note 3 Exynos Android Development] vishalpandey:
Links updated in OP