consider mapped size in limit calculation & review comments