grammar and specifications changed