moved leader and container to core