Updated format
more progress