more updates to scanning and client