Unstable commit

Due to performance fixes, it became falty. To be corrected