More work on TA840. Ready for review