Last updates before scanner testing 2