introducing orphans handling