Sort of made a better architecture.