Table didn't work, so updated format for dictionary