change archetecture from duplicating local storage