Update to current code base