Need to redesign architecture