Ah good, I was wondering whether this was still valid per the current data structures.