Updated to our own goldfish device..