Made some code changes
removed unnecessary fileds from the returned object.
fixed a but that caused the numbers to return null