updated parser and added analytics output