Finally new patch system fully implemented.