Updated grammar and composition