Update helper functions
Update helper functions