Client modifications

Merge temp branch to master