Added extra protection and display scan information