additions and formatting