Modified for new format with __