Changes on core. Part1