dtiqa now working
merge commit