updated with glossary