a little of format changes