It almost works. Now code is cleaner nad it works more stable.. but still
not always