JRCU's Patch (10/11)