WIP: update format