Removed json parsing, and changed data to d