Adding logic to display - this time it works