Fixing waiting... againgit add core/