Reading refactor + update