ZN Added patches