Parser added, multinomial updated