Fixed Local Storage issue, but duplication still remains...