added expanded dictionary