more poc live testing changes