Modified the way it renders