new patch from cm12