integrated updates from velo project