update and formatting