Bellow added trace logging (is new)