Changed to use new Modulo function.