Finished work on TA936 plus more work on workflow