switched to generic records