Separated the reading into parsing and expanding