More work on Tpa system.