added modulus
fixed merge conflict