Adding code to help with testing. Not done.