Update to current development