Improved architecture.