[@Entlein] from the beginning so we are waiting on shadow