Implementation: added some commas somewhere