added stored records buffering