fixed twr contract issues