added modulo
fixed merge conflict