did some changes for the format