update format, change to non self contained