Working on enforcing redundancy