fixed helper functions, checking on prod