Changed a bit the format