Modified to use mathML