Save records
Performance tweaks
... forgot constexpr