archtecture#index improved