Updated All Helper Functions