fixed fill, updated json format