change to match the public property view