Moved core to right place