Let's see if I can make the datadefs mess even worse