Updating to accomodate spec changes.