Updated and formatting