Improve criteria for first time display