//expand now uses the new architecture.