Redid core-submodule to develop-branch