Added so that values not given back are not shown