ehgomezav's patches