Data now get parsed

Requested changes are made