2.1 Enhanced formatting