Develop Bugs

[Guide] AdAway for systemless hosts file

About the only reason I root my phone is to install AdAway. I'd prefer to not modify the system partition to help make OTA's easier to get and to allow Android Pay to work. AdAway has a flashable .zip file that preps the hosts file to use the systemless root structure that comes along with SuperSU. Unfortunately, that script depends on being able to access the /data partition inside of TWRP which isn't going to happen any time soon on the HTC 10. Fortunately, it is easy for us to manually replicate what the flashable .zip is trying to do.
This isn't a detailed how-to, but more of a set of guidelines. Don't blame me if your phone explodes.
Root the phone with the latest SuperSU.
Download the AdAway_systemless_hosts_v2.zip file from the Unofficial AdAway thread.
Extract the files from inside the zip. We are only interested in two files in the support folder.
Connect the phone to your PC and turn on file transfer mode.
Copy "hosts" and "0000adaway.script" that you just extracted to the internal storage of your phone.
Use a program file Root Explorer to move "hosts" into /su/etc and move "0000adaway.script" into /su/su.d (this probably could have been done with ADB push, but I got permission errors when I tried it that way and I'm impatient and lazy).
Chmod 0755 /su/su.d/0000adaway.script (I used a root shell on the phone via ADB)
Install AdAway (I used the link in the Unofficial AdAway thread.)
Reboot the phone.
Run AdAway like normal. By default it should use /system/etc/hosts which is what you want.
If something doesn't work, figure out why and fix it. I'm happy to answer questions to the best of my ability.

AdAway works without problems here, with simple press activate button.

starbase64 said:
AdAway works without problems here, with simple press activate button.
Click to expand...
Click to collapse
Yup
Sent from my HTC 10 using Tapatalk

starbase64 said:
AdAway works without problems here, with simple press activate button.
Click to expand...
Click to collapse
Yes, but it modifies the /system partition unless you do the trick in OP. If I'm correct, you will have problems with OTA updates and Google Pay if you let AdAway directly modify the hosts file on /system.

Now that TWRP can access /data, can we just flash the zip?

goodtimes50 said:
Now that TWRP can access /data, can we just flash the zip?
Click to expand...
Click to collapse
Yes, you can. I downloaded that zip and apk from the Unofficial AdAway thread linked above. Booted into TWRP, flashed the newest betaSuperSU2.74-2-forceencrypt (not related to this, just so I'd be on the latest version), then the AdAway_systemless_hosts_v2.zip, rebooted and installed the apk and let it run. Rebooted. Showing hosts location as /system32/etc/hosts as the OP says is a good thing, and both files mentioned are in their correct places per Root Browser. [emoji106]
Sent from my HTC 10 using XDA-Developers mobile app

Sorry that it doesn't completely match the thread here but I think my question could fit in here anyway.
Do I suggest correctly that with systemless root, systemless AdAway and the stock recovery OTAs should be fully usable? Since there's no other modification to /system then.

bmwbasti said:
Sorry that it doesn't completely match the thread here but I think my question could fit in here anyway.
Do I suggest correctly that with systemless root, systemless AdAway and the stock recovery OTAs should be fully usable? Since there's no other modification to /system then.
Click to expand...
Click to collapse
I believe that is correct. There hasn't been a new OTA for my phone yet so I can't verify. However, when I do the check for new software it tells me no new updates (as opposed to the message about the files system being corrupt). I believe Android Pay should also work. I have it installed and added a new card, but I haven't tested making a purchase yet.

Thanks for the guide.
My device is rooted, but I didn't found su folder in anywhere when I use Root Explorer with root access, does anyone tell me how to get su folder and make AdAway work?

Fix for AdAway.
matif525 said:
Thanks for the guide.
My device is rooted, but I didn't found su folder in anywhere when I use Root Explorer with root access, does anyone tell me how to get su folder and make AdAway work?
Click to expand...
Click to collapse
Your device may use su, & still not have an su folder (at all) that is used for hosts file (ie systemless root). Just do this..
Download... Terminal emulator.
https://play.google.com/store/apps/details?id=jackpal.androidterm
Open terminal
Then enter these commands.. "Quote"
su
mount -orw,remount /system
rm /system/etc/hosts
ln -s /data/data/hosts /system/etc/hosts
mount -orw,remount /system
Now open AdAway go to preferences and select option to " Target hosts file"
Select /data/data/hosts
Enjoy..
If you still have ads in apps do this!!!
githyanki said:
Open the 3 dot menu in adaway, chose log DNS request. Enable TCP dump.
Open the app with ads, when ad loads, go back to adaway, and open log.
Long press any entries and chose black list.
Profit
Click to expand...
Click to collapse
All credit where credit is due. I just shared what I read else where.
Read here for more details..
https://github.com/AdAway/AdAway/issues/770
&
http://forum.xda-developers.com/showthread.php?t=2190753&page=143#post68988079
There is a known issue in HTC devices involves S-off. If the above doesn't solve this for you message here I'll follow. Or pm me. I work wierd hours be patient.

Rom Maximus 3.0.0 ( Android 7 ).Any instruction don't works,adaway no blocked ads.

regarding su folder to move files to
FreydNot said:
About the only reason I root my phone is to install AdAway. I'd prefer to not modify the system partition to help make OTA's easier to get and to allow Android Pay to work. AdAway has a flashable .zip file that preps the hosts file to use the systemless root structure that comes along with SuperSU. Unfortunately, that script depends on being able to access the /data partition inside of TWRP which isn't going to happen any time soon on the HTC 10. Fortunately, it is easy for us to manually replicate what the flashable .zip is trying to do.
This isn't a detailed how-to, but more of a set of guidelines. Don't blame me if your phone explodes.
Root the phone with the latest SuperSU.
Download the AdAway_systemless_hosts_v2.zip file from the Unofficial AdAway thread.
Extract the files from inside the zip. We are only interested in two files in the support folder.
Connect the phone to your PC and turn on file transfer mode.
Copy "hosts" and "0000adaway.script" that you just extracted to the internal storage of your phone.
Use a program file Root Explorer to move "hosts" into /su/etc and move "0000adaway.script" into /su/su.d (this probably could have been done with ADB push, but I got permission errors when I tried it that way and I'm impatient and lazy).
Chmod 0755 /su/su.d/0000adaway.script (I used a root shell on the phone via ADB)
Install AdAway (I used the link in the Unofficial AdAway thread.)
Reboot the phone.
Run AdAway like normal. By default it should use /system/etc/hosts which is what you want.
If something doesn't work, figure out why and fix it. I'm happy to answer questions to the best of my ability.
Click to expand...
Click to collapse
Hi there, ive got a mate 8, not sure if this adblocker will work on it but i want to try it out anyway. Ive unzipped the file but which folder in su do i move the files to? screenshot of the folders i have in su

Change the DPI with on a systemless root/xposed setup?

I've just flashed the stock 3.2.0 ROM and for the first time rooted using the systemless method and have installed the systemless version of xposed. How do I change the DPI on the OP3 with this setup? Thanks in advance!!

No need for xposed, use Le DPI changer on plays store and select 'Use Shell WM' to apply, it works perfectly.

Striatum_bdr said:
No need for xposed, use Le DPI changer on plays store and select 'Use Shell WM' to apply, it works perfectly.
Click to expand...
Click to collapse
Lame, it's not working... supersu is working, and so is xposed, adaway, YouTube adaway etc... I selected Shell WM as you said.
Sent from my ONEPLUS A3000 using Tapatalk

rickyx32 said:
Lame, it's not working... supersu is working, and so is xposed, adaway, YouTube adaway etc... I selected Shell WM as you said.
Sent from my ONEPLUS A3000 using Tapatalk
Click to expand...
Click to collapse
Turn off Shell WM, and press edit build.prop then reboot. It worked for me. Hope i helped

@_MartyMan_ Are you using systemless root? I heard that you shouldn't mess with the system if you are.
Sent from my ONEPLUS A3000 using Tapatalk
Edit: Hahaha, it worked, thanks!

rickyx32 said:
@_MartyMan_ Are you using systemless root? I heard that you shouldn't mess with the system if you are.
Sent from my ONEPLUS A3000 using Tapatalk
Edit: Hahaha, it worked, thanks!
Click to expand...
Click to collapse
Amm yes, i'm using systemless root.
Your welcome

Do you have a link to the systemless root? I don't seem to find it or I am looking wrong.

superiscch said:
Do you have a link to the systemless root? I don't seem to find it or I am looking wrong.
Click to expand...
Click to collapse
Here you go man, this is the latest systemless root SuperSU made specifically for our OP3 that can be flashed with TWRP. Came out this morning.
https://www.androidfilehost.com/?fid=24591000424944601
Sent from my ONEPLUS A3000 using Tapatalk

In my case, I changed DPI by adb commands.
But I have some problem on some apps. Is there any difference between adb method and chaning build.prop?
I've not rooted my device but I would consider if there's differences with 2 methods.

jerrygo2 said:
In my case, I changed DPI by adb commands.
But I have some problem on some apps. Is there any difference between adb method and chaning build.prop?
I've not rooted my device but I would consider if there's differences with 2 methods.
Click to expand...
Click to collapse
What kind of issues are you having and at what DPI?
Sent from my A0001 using Tapatalk

rickyx32 said:
I've just flashed the stock 3.2.0 ROM and for the first time rooted using the systemless method and have installed the systemless version of xposed. How do I change the DPI on the OP3 with this setup? Thanks in advance!!
Click to expand...
Click to collapse
It is the same method, whether you are systemless or not. You just need root access to mount system in r/w so you can edit the build.prop file. Obtaining the root access is determined by the app itself, not the root method. Some file explorers may not like systemless though...ES file explorer for example. However, you can change the build.prop via terminal or adb mode as well. There are many ways to change the DPI. In regards to your root method, that does not really matter.

Changing DPI is a little bit different for OnePlus phones. I did it by adding a line to my build.prop file. In other phones the line is already there and you just have to change the value.
Steps:
1. Use file explorer with root access. I use root explorer pro, but there are free apps as well.
2. Go to /system/ and locate build.prop file
3. Long press the file and select 'open in text editor'
4. Add the line 'ro.sf.lcd_density=xxx' where xxx is your desired DPI.
5. Save and close
6. Reboot
7. Profit

rickyx32 said:
What kind of issues are you having and at what DPI?
Sent from my A0001 using Tapatalk
Click to expand...
Click to collapse
Adm method always giving problem not croping correctly play store icons get big so your rooted and you can use le dpi changer or build.prop
Sent from my ONEPLUS3

how is systemless different from normal (noob) and why do it that way?

I've developed a systemless changer. This will modify the boot.img (init.supersu.rc) while the installation of supersu to add an additional entry which changes the DPI to the wanted value. It was necessary this way as the init scripts located in /su/su.d are loading too late to be able to change the DPI anymore.
1. Simply drop a file into /data/custom_ramdisk_patch.sh with the following content, it will change the DPI to 401:
Code:
#!/sbin/sh
COM=/tmp/supersu/common
echo "custom boot patcher"
echo "COM: $COM" > /tmp/hi
cp $COM/init.supersu.rc /tmp/init.supersu.rc
MFILE=/tmp/init.supersu.rc
echo "" >> $MFILE
echo "on init" >> $MFILE
echo " setprop ro.sf.lcd_density 401" >> $MFILE
/su/bin/sukernel --cpio-add /sutmp/ramdisk /sutmp/ramdisk 750 init.supersu.rc $MFILE >> /tmp/hi
if [ $? -ne 0 ]; then
echo "patch failed" >> /tmp/hi
exit 1
fi
exit 0
2. install systemless supersu.zip (at least 2.76) again
3. profit
This could be improved in such a way, that a script file is executed on init to allow any build.prop changes or third party execution as well, but currently I'm only interested in the DPI change

Modifying the /OEM partition?

Has anyone figured out how to edit the /OEM partition? I've tried through root Explorer and through adb shell Su via terminal
Sent from my Moto Z (2) using Tapatalk

If it's anything like /system it's mounted read-only.
If you're rooted and run Linux:
# adb shell
$ su
# mount -o remount,rw /OEM
... and see what happens.
I don't know if the phone is running SELinux or not, and if so you'll need more special steps. Find out with # getenforce

Quantumstate said:
If it's anything like /system it's mounted read-only.
If you're rooted and run Linux:
# adb shell
$ su
# mount -o remount,rw /OEM
... and see what happens.
I don't know if the phone is running SELinux or not, and if so you'll need more special steps. Find out with # getenforce
Click to expand...
Click to collapse
Aye, I attempted to remount like this but it will not work for some weird reason.
Sent from my Moto Z (2) using Tapatalk

elijahaf97 said:
Aye, I attempted to remount like this but it will not work for some weird reason.
Sent from my Moto Z (2) using Tapatalk
Click to expand...
Click to collapse
wipe it using twrp, and dont use it. remove the items from oem you wish to keep and migrate them to the /system where they need to go, set perms and enjoy.
OEM is read only and is mounted to google, and if you delete something it gets put back, just wipe that partition and enjoy lol

Team DevDigitel said:
wipe it using twrp, and dont use it. remove the items from oem you wish to keep and migrate them to the /system where they need to go, set perms and enjoy.
OEM is read only and is mounted to google, and if you delete something it gets put back, just wipe that partition and enjoy lol
Click to expand...
Click to collapse
Last time I wiped it I was unable to boot.
Sent from my Moto Z (2) using Tapatalk

elijahaf97 said:
Last time I wiped it I was unable to boot.
Sent from my Moto Z (2) using Tapatalk
Click to expand...
Click to collapse
that shouldnt be the case... again you can just move everything from oem to /system and match the perms 1st then wipe it and essentiall all would be good, may need to wipe cache/dalvik cache to rebuild data for apps after move.

You can't add data to oem, but I was able to remove items from oem in TWRP with a kernel that had verity removed and state still green. (The TWRP custom kernel on Oreo and Pantheon both have this option). I still kept safetynet status green as well doing it through TWRP. Be sure to mount oem first!

Doesn't work on latest stock, OEM r/o. Any thought?

If you're just trying to debloat then you can follow this guide.

Uzephi said:
You can't add data to oem, but I was able to remove items from oem in TWRP with a kernel that had verity removed and state still green. (The TWRP custom kernel on Oreo and Pantheon both have this option). I still kept safetynet status green as well doing it through TWRP. Be sure to mount oem first!
Click to expand...
Click to collapse
Can you explain how to mount /oem partition like you did? I cannot for the life of me mount it in twrp to remove unnecessary apps and keep safetynet good?
Latest Sprint firmware. Latest TWRP. Latest Magisk. Latest Pantheon 8.0 kernel. Any help is greatly appreciated.
Typically I use superSU. But Epic games just made the gamepad Fortnite compatible and I'd like to try it WITH some type of root (Magisk) that won't mess up the safetynet check, yet be able to still have most of my usual root freedom.

gokart2 said:
Can you explain how to mount /oem partition like you did? I cannot for the life of me mount it in twrp to remove unnecessary apps and keep safetynet good?
Latest Sprint firmware. Latest TWRP. Latest Magisk. Latest Pantheon 8.0 kernel. Any help is greatly appreciated.
Typically I use superSU. But Epic games just made the gamepad Fortnite compatible and I'd like to try it WITH some type of root (Magisk) that won't mess up the safetynet check, yet be able to still have most of my usual root freedom.
Click to expand...
Click to collapse
Haven't tried on Oreo. Only got it to work on nougat by forcing verity off and disabling encryption.

deleted ...

[ROOT] Enable Soli in any country

Made a new thread as seems this is demanded option. Some people already checked this and looks like this works. I can't check right now but if you want, please check and post if it works for you.
Restriction is phone number country code based, can be bypassed. Also looks like its developers left setting to disable country checks at all. To do that, you just need to change android setting 'pixel.oslo.allowed_override' to '1' or 'true'.
Connect Pixel 4 with developer mode and execute command in adb shell:
Code:
adb shell setprop pixel.oslo.allowed_override true
or
Code:
adb shell "setprop persist.pixel.oslo.allowed_override true; setprop ctl.restart zygote"
or edit system/build.prop with some app (eg. MagiskHide Props Config)
You need root to do this.
Also there is Xposed Module in xposed manager to do this automatically called "EnableSoliOnPixel4", here's thread about it https://forum.xda-developers.com/pixel-4-xl/themes/success-enable-soli-china-t3994917

Do I need root permission to execute this command via adb? Thanks
Sent from my Google Pixel 2 using XDA Labs

Monazite said:
Do I need root permission to execute this command via adb? Thanks
Sent from my Google Pixel 2 using XDA Labs
Click to expand...
Click to collapse
Yes, without root you can’t edit system props

Eugnis said:
Yes, without root you can’t edit system props
Click to expand...
Click to collapse
getting failed to set property reply. any idea what i'm doing wrong?

Does it mean that I still can use soli in any country even that country doesn't support for it ?
For example, If I traveled to Japan one day, I still can use soli after enable soli by this xposed module ?
Kris

omar5099 said:
getting failed to set property reply. any idea what i'm doing wrong?
Click to expand...
Click to collapse
Looks like ADB not received root rights on phone. To check this use
Code:
adb shell su
if you receive response ' su: not found ' then you should enable root access for adb on phone (with supersu or similar)
Also you can set this prop with MagiskHide Props Config from phone if you used Magisk to root it

Kris Chen said:
Does it mean that I still can use soli in any country even that country doesn't support for it ?
For example, If I traveled to Japan one day, I still can use soli after enable soli by this xposed module ?
Kris
Click to expand...
Click to collapse
Yes, this setting just disable country check at all. So Soli will work worldwide

Eugnis said:
Looks like ADB not received root rights on phone. To check this use
Code:
adb shell su
if you receive response ' su: not found ' then you should enable root access for adb on phone (with supersu or similar)
Also you can set this prop with MagiskHide Props Config from phone if you used Magisk to root it
Click to expand...
Click to collapse
I've obtained root for ADB shell via this command, however none of those 2 original adb lines are working. I'm still getting the failed to set property reply.
Any help appreciated...

Now I gotta root my phone and lose automatic updates just to be able to use it normally. Thanks a lot, Google!! _l_

You will still get automatic updates, you can root your phone, set the persistent property, and remove the root. Should persist across updates.

Bogega said:
I've obtained root for ADB shell via this command, however none of those 2 original adb lines are working. I'm still getting the failed to set property reply.
Any help appreciated...
Click to expand...
Click to collapse
yes same here, any1 got this to work ? thanks

Pixeling said:
You will still get automatic updates, you can root your phone, set the persistent property, and remove the root. Should persist across updates.
Click to expand...
Click to collapse
So if I set the property and then unroot, it will persist even after OTA updates? No need to root again and set it again after every OTA?

aco.falc said:
So if I set the property and then unroot, it will persist even after OTA updates? No need to root again and set it again after every OTA?
Click to expand...
Click to collapse
That's what I suspect since the property lives in /data which is not changed/erased after OTA. I've not tried it myself however that's probably what I will do when I get the phone.

aco.falc said:
So if I set the property and then unroot, it will persist even after OTA updates? No need to root again and set it again after every OTA?
Click to expand...
Click to collapse
Performing some more reading on the subject, there is a possibility that unlocking the bootloader by itself trips safetynet which in turn prevents OTA. I can't know whether this is true for sure, but in this case keeping Magisk root shall hide that and let you download the OTA.
Before applying the OTA you should use magisk to restore the boot.img, let the OTA install, and then let Magisk install itself to the other inactive flash slot where the OTA is. That will make sure that root is kept intact post update and keep hiding that the bootloader is unlocked. Can anyone confirm?

WORKED
hello, i can confirm its working, steps to follow :
when u flash the magisk_patched image the phone wont boot at first, so u have to flash the boot.img then reflash the magisk_patched.
then the phone will boot normally.
after that, download terminal from play store, and type in it : SU , this will ask u for root permissions
then u need to type these 3 commands within the terminal :
setprop pixel.oslo.allowed_override true
setprop persist.pixel.oslo.allowed_override true
setprop ctl.restart zygote
then motion sense will turn on.
enjoy!
if u need detailed steps about the whole thing let me know

sta3b said:
hello, i can confirm its working, steps to follow :
when u flash the magisk_patched image the phone wont boot at first, so u have to flash the boot.img then reflash the magisk_patched.
then the phone will boot normally.
after that, download terminal from play store, and type in it : SU , this will ask u for root permissions
then u need to type these 3 commands within the terminal :
setprop pixel.oslo.allowed_override true
setprop persist.pixel.oslo.allowed_override true
setprop ctl.restart zygote
then motion sense will turn on.
enjoy!
if u need detailed steps about the whole thing let me know
Click to expand...
Click to collapse
Can confirm that typing these commands in terminal did the trick. Used 'Terminal Emulator for Android' app from playstore.
And I skipped first steps (flashing boot.img etc) as I'm already rooted.
Thanks!

Bogega said:
Can confirm that typing these commands in terminal did the trick. Used 'Terminal Emulator for Android' app from playstore.
And I skipped first steps (flashing boot.img etc) as I'm already rooted.
Thanks!
Click to expand...
Click to collapse
It works for me! Thank you!
Do I need to do this all over again when I reboot my phone?

It seems that when rebooting the phone the soli is disabled again, can someone confirm?
Also I read here something about unrooting? can I really root and unroot everytime I want and retain OTA updates?

chris111111 said:
It works for me! Thank you!
Do I need to do this all over again when I reboot my phone?
Click to expand...
Click to collapse
Soli doesn't survive reboots if you're using this method.
There's a magisk module (non Xposed) which solves this though (https://forum.xda-developers.com/pixel-4-xl/themes/enable-soli-contries-magisk-module-t3997035)

wolfgangam31 said:
It seems that when rebooting the phone the soli is disabled again, can someone confirm?
Also I read here something about unrooting? can I really root and unroot everytime I want and retain OTA updates?
Click to expand...
Click to collapse
correct, rebooting the phone will cause SOLI to get disabled, you need to re-enter the commands in the terminal to get it to work again

Can't Remove System Apps (even with root priviledges)

I recently rooted my moto G fast (boost) but I'm unable to debloat. Even with root I still can't seem to figure out how to successfully remove system apps from the following folders: /product/app, /product/priv-app, /system_root/system/app, or /system_root/system/priv-app. I've tried running chmod 755 to no avail. The ability to debloat is the main reason I always root so if I can't do that then I don't really see any point in having root at all. I like to be able to freely add or remove apps from the priviledged apps folder. This is far from my first rodeo but I'm not a professional by any means; I still have quite a bit to learn, so correct me if I'm wrong but I'm assuming its because selinux is set to enforcing so I've been scouring the internet looking for a way to set it to permissive and so far nothing has worked. I tried running "su setenforce 0" in both termux and the twrp terminal but neither were successful. I'm also assuming this is the reason I've been unable to install busybox to xbin. I got it to install fine in sbin but I have a couple apps which require it to be in xbin in order to function properly. Any and all advice would be greatly appreciated

Use a third party app in play store to remove system apps.
I recommend this: https://play.google.com/store/apps/details?id=com.jumobile.manager.systemapp&hl=en_US&gl=US

mrsiri said:
Use a third party app in play store to remove system apps.
I recommend this: https://play.google.com/store/apps/details?id=com.jumobile.manager.systemapp&hl=en_US&gl=US
Click to expand...
Click to collapse
I have been using third party apps. I have SD Maid pro and even that can't remove anything that's in system apps or priv system apps.

What about deleting the files with Root explorer (file manager with root access) ? you can find it on the play store
Otherwise try using adb commands:
adb shell
pm uninstall --user 0 com.useless.piece.of.trash

mrsiri said:
What about deleting the files with Root explorer (file manager with root access) ? you can find it on the play store
Otherwise try using adb commands:
adb shell
pm uninstall --user 0 com.useless.piece.of.trash
Click to expand...
Click to collapse
Did it work?

mrsiri said:
Did it work?
Click to expand...
Click to collapse
Haven't gotten a chance to try ADB just yet. Ive tried using a couple different root file explorers with no luck (I assume due to either selinux or not having BusyBox in xbin) but last night I was somehow able to drunkenly set selinux to permissive and fix the busybox issue (unfortunately I can't recall how lol) so I'm gonna try again with a root uninstaller after work. I realize my efforts are largely pointless since this phone performs perfectly even with the bloat. I pretty much just do this on principal cuz I like knowing I have total control of my device.

AMShiech said:
Haven't gotten a chance to try ADB just yet. Ive tried using a couple different root file explorers with no luck (I assume due to either selinux or not having BusyBox in xbin) but last night I was somehow able to drunkenly set selinux to permissive and fix the busybox issue (unfortunately I can't recall how lol) so I'm gonna try again with a root uninstaller after work. I realize my efforts are largely pointless since this phone performs perfectly even with the bloat. I pretty much just do this on principal cuz I like knowing I have total control of my device.
Click to expand...
Click to collapse
Try the ADB method, I used it once and successfully deleted phone app for trying the pixel 2 method of clearing verizon gray OEM unlock toggle on my G6 Plus, although it didn't help in the end...