added NoOp and refactored eval_op