added some markup for legacy state