Additions and formatting changes