The new architecture seems to work