Update to Helper Functions