Nunchuckoo controller reference changes