More asthetic changes on the theme this time.