adjust format and name