updated for public view