adding working yoda functionality