Changed picture svc due to merge conflict, added CLIENT_ID back in