started to adapt the parsing code