Updates and formatting