Finished work on trace generator