added tis + various changes