Add the spans back now that they work :3