Working more on aesthetic