Changes on core. Part1.2