Add diagnostic stuff to rb500