#12 -  Refactor novih redova i promena tip condition neterminala