Added checking for display