Formatting
Change to merged v4 and v6