Improved the reader etc