change grammar, make procedure name optional