Updated With pawitp Latest Patch Changes