Changed code to reflect database changes and also implemented recount in parser.