Updating to current spec