add modulus
merge conflict fixed