updates to match client dev branch