merge with por.trac
use old names
merge with trac.por