changed some format