We should figure out the comma thing