Updated for amia test.