work in progress client updates