working changes on tna
tna is error free
TNA working
merge changes incorporated
Merge branch 'pc-tna'