Trying to remove the memory leak from this guy :(