Added modulus
Added modulo
Merged conflicts