change formatting and flow