minor reformulation in architecture.