New functions for Client, updated App