More updated formatting