Small changes on the format