Adding formatting
merged with Nick's