Removed logic around displaying