modified to JSON