Trying to make the new architecture work.