Commit482014a

client changes.