removed some crumbs, ghosts support