made conformant to our grammar