Trying to add some performance investigation tools