More work on reader code