qis stuff
merge
second version qt
merging