Updated for updated spec