updated for public facing