Made API match Greg's