Added Function level check, Bugfix revb, xnor