updated with json fix