Enabled baselining … found already some bugs