Changing the architecture a little bit.