Expanded section with changes from original client