Working through format changes; still broken