Parser updated and working - model for ranking updated