Review & fix reading order