re-added memory tracking