Following esolid-base changes