diff --git a/proglabs/lab7-8/10 b/proglabs/lab7-8/10
deleted file mode 100755
index a324df3..0000000
Binary files a/proglabs/lab7-8/10 and /dev/null differ
diff --git a/proglabs/lab7-8/18 b/proglabs/lab7-8/18
deleted file mode 100755
index f502fb3..0000000
Binary files a/proglabs/lab7-8/18 and /dev/null differ
diff --git a/proglabs/lab7-8/9 b/proglabs/lab7-8/9
deleted file mode 100755
index 8059347..0000000
Binary files a/proglabs/lab7-8/9 and /dev/null differ
diff --git a/proglabs/lab7-8/1.c b/proglabs/lab7/1.c
similarity index 100%
rename from proglabs/lab7-8/1.c
rename to proglabs/lab7/1.c
diff --git a/proglabs/lab7/10 b/proglabs/lab7/10
new file mode 100755
index 0000000..a443a42
Binary files /dev/null and b/proglabs/lab7/10 differ
diff --git a/proglabs/lab7-8/10.c b/proglabs/lab7/10.c
similarity index 100%
rename from proglabs/lab7-8/10.c
rename to proglabs/lab7/10.c
diff --git a/proglabs/lab7-8/11.c b/proglabs/lab7/11.c
similarity index 100%
rename from proglabs/lab7-8/11.c
rename to proglabs/lab7/11.c
diff --git a/proglabs/lab7-8/12.c b/proglabs/lab7/12.c
similarity index 100%
rename from proglabs/lab7-8/12.c
rename to proglabs/lab7/12.c
diff --git a/proglabs/lab7-8/13.c b/proglabs/lab7/13.c
similarity index 100%
rename from proglabs/lab7-8/13.c
rename to proglabs/lab7/13.c
diff --git a/proglabs/lab7-8/14.c b/proglabs/lab7/14.c
similarity index 100%
rename from proglabs/lab7-8/14.c
rename to proglabs/lab7/14.c
diff --git a/proglabs/lab7-8/15.c b/proglabs/lab7/15.c
similarity index 100%
rename from proglabs/lab7-8/15.c
rename to proglabs/lab7/15.c
diff --git a/proglabs/lab7-8/16.c b/proglabs/lab7/16.c
similarity index 100%
rename from proglabs/lab7-8/16.c
rename to proglabs/lab7/16.c
diff --git a/proglabs/lab7-8/17.c b/proglabs/lab7/17.c
similarity index 100%
rename from proglabs/lab7-8/17.c
rename to proglabs/lab7/17.c
diff --git a/proglabs/lab7/18 b/proglabs/lab7/18
new file mode 100755
index 0000000..f316f90
Binary files /dev/null and b/proglabs/lab7/18 differ
diff --git a/proglabs/lab7-8/18.c b/proglabs/lab7/18.c
similarity index 73%
rename from proglabs/lab7-8/18.c
rename to proglabs/lab7/18.c
index c9dce57..ff0c548 100644
--- a/proglabs/lab7-8/18.c
+++ b/proglabs/lab7/18.c
@@ -18,20 +18,29 @@ int main() {
     exit = x = swt = scan = 1;
     while(exit){
         printf("hours: ");
-        scanf("%d", &h);
-        while (getchar() != '\n');
+        while(scanf("%d", &h)!=1){
+            printf("input err\n");
+            if(getchar() == EOF) return 0; 
+            while (getchar() != '\n') continue; 
+            printf("hours: ");
+        }
+        while (getchar() != '\n') continue;
         do{
+                while (getchar() != '\n') continue; 
                 printf("Choose tarif:\n");
                 printf("a) $%.2f/h\tb) $%.2f/h\n",t1,t2);
                 printf("c) $%.2f/h\td) $%.2f/h\n",t3,t4);
                 printf("q) exit\nInput: ");
                 sw = getchar();
+                if(getchar() == EOF){return 0;}
+				while (getchar() != '\n') continue;
                 switch(sw){
                     case 'a': t = t1; swt = 0; break;
                     case 'b': t = t2; swt = 0; break;
                     case 'c': t = t3; swt = 0; break;
                     case 'd': t = t4; swt = 0; break;
-                    case 'q': exit = 0; break;
+                    case 'q': exit = 0; break; 
+                    default: printf("input err\n");
                 }
             }while(swt&&exit);
 
diff --git a/proglabs/lab7/18.c~ b/proglabs/lab7/18.c~
new file mode 100644
index 0000000..ff0c548
--- /dev/null
+++ b/proglabs/lab7/18.c~
@@ -0,0 +1,61 @@
+#include <stdio.h>
+#define t1 8.75
+#define t2 9.33
+#define t3 10.00
+#define t4 11.20
+// #define t 10 //zp
+#define s 40 //sverh
+#define u 1.5 //sverh*
+#define n1 0.15 //tax1
+#define n2 0.2
+#define n3 0.25
+#define m1 300 //maxbeftax2
+#define m2 150
+
+int main() {
+    int h,sw,x,swt,exit,scan;
+    float t,tax,a;
+    exit = x = swt = scan = 1;
+    while(exit){
+        printf("hours: ");
+        while(scanf("%d", &h)!=1){
+            printf("input err\n");
+            if(getchar() == EOF) return 0; 
+            while (getchar() != '\n') continue; 
+            printf("hours: ");
+        }
+        while (getchar() != '\n') continue;
+        do{
+                while (getchar() != '\n') continue; 
+                printf("Choose tarif:\n");
+                printf("a) $%.2f/h\tb) $%.2f/h\n",t1,t2);
+                printf("c) $%.2f/h\td) $%.2f/h\n",t3,t4);
+                printf("q) exit\nInput: ");
+                sw = getchar();
+                if(getchar() == EOF){return 0;}
+				while (getchar() != '\n') continue;
+                switch(sw){
+                    case 'a': t = t1; swt = 0; break;
+                    case 'b': t = t2; swt = 0; break;
+                    case 'c': t = t3; swt = 0; break;
+                    case 'd': t = t4; swt = 0; break;
+                    case 'q': exit = 0; break; 
+                    default: printf("input err\n");
+                }
+            }while(swt&&exit);
+
+        if(!swt && exit){
+            if (h>s){tax = a = (s*t + ((h-s) * (t*u)));}
+            else(tax = a = h*t);  
+
+            if (tax>m1)
+            {
+                if(tax>m2){tax = (m1*n1) + (m2*n2) + ((tax-m1-m2)*n3);}
+                else(tax = (m1*n1) + ((tax-m1)*n2));
+            }
+            else (tax*=n1);
+            printf("Acc: %.3f\nTax: %.3f\nReceived: %.3f\n",a,tax,a-tax);
+        }} 
+
+  return 0;
+}
diff --git a/proglabs/lab7-8/19.c b/proglabs/lab7/19.c
similarity index 100%
rename from proglabs/lab7-8/19.c
rename to proglabs/lab7/19.c
diff --git a/proglabs/lab7-8/2.c b/proglabs/lab7/2.c
similarity index 100%
rename from proglabs/lab7-8/2.c
rename to proglabs/lab7/2.c
diff --git a/proglabs/lab7-8/3.c b/proglabs/lab7/3.c
similarity index 100%
rename from proglabs/lab7-8/3.c
rename to proglabs/lab7/3.c
diff --git a/proglabs/lab7-8/4.c b/proglabs/lab7/4.c
similarity index 100%
rename from proglabs/lab7-8/4.c
rename to proglabs/lab7/4.c
diff --git a/proglabs/lab7-8/5.c b/proglabs/lab7/5.c
similarity index 100%
rename from proglabs/lab7-8/5.c
rename to proglabs/lab7/5.c
diff --git a/proglabs/lab7-8/6.c b/proglabs/lab7/6.c
similarity index 100%
rename from proglabs/lab7-8/6.c
rename to proglabs/lab7/6.c
diff --git a/proglabs/lab7-8/7.c b/proglabs/lab7/7.c
similarity index 100%
rename from proglabs/lab7-8/7.c
rename to proglabs/lab7/7.c
diff --git a/proglabs/lab7-8/8.c b/proglabs/lab7/8.c
similarity index 100%
rename from proglabs/lab7-8/8.c
rename to proglabs/lab7/8.c
diff --git a/proglabs/lab7/9 b/proglabs/lab7/9
new file mode 100755
index 0000000..9ca7ae6
Binary files /dev/null and b/proglabs/lab7/9 differ
diff --git a/proglabs/lab7-8/9.c b/proglabs/lab7/9.c
similarity index 98%
rename from proglabs/lab7-8/9.c
rename to proglabs/lab7/9.c
index 8fac608..603fb2c 100644
--- a/proglabs/lab7-8/9.c
+++ b/proglabs/lab7/9.c
@@ -1,7 +1,7 @@
 #include <stdio.h>
 void power(double *x, int *exp, double *xpow, int *i);
 
-int main(void){
+int main(){
     double x, xpow;
     int exp, i;
     i = 1;
diff --git a/proglabs/lab7-8/test b/proglabs/lab7/test
similarity index 100%
rename from proglabs/lab7-8/test
rename to proglabs/lab7/test
diff --git a/proglabs/lab7-8/tmp.out b/proglabs/lab7/tmp.out
similarity index 100%
rename from proglabs/lab7-8/tmp.out
rename to proglabs/lab7/tmp.out