Update to match latest code