Update to a slightly better architecture.