Added new patch system fixed issues