Added features
Formatting