Rearranged some logic regarding Organizer reading