Added Modulo math
fixed conflict