changed timestamp to ms
fixed json format