Add back teliwave and mycomp