added modulus
merge conflicts