Could update this to use span