Fixed everything related to Startec repository - third commit