Further changes for the Use cases on the live site.