OpNode return logic needs to be perfected