Added scanner back in i hope!