Source client (8/25)

Source client