Changed format a little