Updated scanning