Updated HeapDriver