Use Faults instead of hardcoded numbers