More work on scanner