Changed the parsing