Final patch (insyaAllah)