moved some statements around so I can pull in trace-location