More work on scanning software