Making change to new join grammar.