Updated: Formatting and some titles