Change for the display as per Kirills request