Change # of entries estimate, revert @Overrides