hunting for memory leaks put it back for a while