Added fill, diags