Update by Mojaz Foundation