Removed 1 issue of data redundancy