Addressed freedback from Ken