Formatting and return to v.3