Additions for OnePlus/JEDI