Updated helper for sake of faults