added more parsing for reading