format and add final