added pauses in threads
fixed merge coflicts