More data hacking for the new features...