Updated WIREscanner - almost done