tighten data-modeldata even more to speed up the code